Auto merge of #2804 - skeleten:master, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 29 Jun 2016 17:19:46 +0000 (10:19 -0700)
committerGitHub <noreply@github.com>
Wed, 29 Jun 2016 17:19:46 +0000 (10:19 -0700)
Add color support for Windows consoles

Unfortunately, the `term` API makes this PR rather inelegant, any hints/pointers to make it better are highly appreciated!

Fixes #2803


Trivial merge